Merge version 13.8+rpi1+deb13u6 and 13.8+deb13u7 to produce 13.8+rpi1+deb13u7

diff --cc debian/changelog
index f65f401a0fc27a04690d9719bad639d987b8bc24,4b368913e5801909992edd3e69ea097e271a3868..aeafdd6329361d49d80ee3cf3bf7b4c7e6a27880
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,12 +1,30 @@@
- base-files (13.8+rpi1+deb13u6) trixie-staging; urgency=medium
++base-files (13.8+rpi1+deb13u7) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +  [changes introduced in 10.3+rpi1 by Peter Michael Green]
 +  * Make further changes in debian/rules rather than directly to files in
 +    package to further avoid merge conflicts.
 +  * Make changes in debian/rules in the "install" step to avoid the need for
 +    code to revert them.
 +  * Add build-dependency on moreutils to support new code in debian/rules.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 20 Jul 2026 14:34:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 13 Sep 2026 15:58:01 +0000
++
+ base-files (13.8+deb13u7) trixie; urgency=medium
+ 
+   * Update debian_version and os-release for Debian 13.7 point release.
+   * Add AGPL-3.0, Artistic-2.0, BSL-1.0, CC-BY-3.0, CC-BY-4.0, CC-BY-SA-3.0,
+     CC-BY-SA-4.0, GFDL-1.1 and OFL-1.1 to common-licenses. Closes: #1136090.
+     Packages in forky/sid which decide to refer to those licenses at their
+     common-licenses location will now be easier to backport for trixie.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 17 Jul 2026 19:05:00 +0200
  
  base-files (13.8+deb13u6) trixie; urgency=medium